Backport of !45 (merged)
assigned to @daissi
added 3 commits
Compare with previous version
marked this merge request as ready
merged