Port 10283
See merge request !1496 (merged)
(cherry picked from commit a0a1d58a)
eebee841 [*] Changes from the feature-10283 working branch have been ported.