Port 10283 See merge request !1496
mentioned in commit d6e167f9
mentioned in merge request !1498 (merged)
mentioned in commit 91ff4fe9