feature-7671_d See merge request !1478
mentioned in commit 06b22d10
mentioned in merge request !1482 (merged)
mentioned in commit 56ecf6c3