Port 10283

See merge request !350

(cherry picked from commit 03d4d4be)

3d010eb7 [*] Changes from the feature-10283 working branch have been ported.
b87a4177 Merge branch 'develop' into 'port-10283'