Merge changes for m10 See merge request !272
mentioned in commit a332720e
mentioned in merge request !305 (merged)