Merge branch 'cherry-pick-b940cfc1' into 'test' See merge request !22
mentioned in commit 8d76499c
mentioned in merge request !24 (merged)