Merge back master into qa (no diffs)
See merge request !240 (merged)
merged
mentioned in commit 11845a07