Features 15782 15818 12702 See merge request !1860
mentioned in commit a4aa0ad4
mentioned in merge request !1862 (closed)