Port 9376

See merge request !1466

(cherry picked from commit 4cb0fde1)

d9f7201e [*] Ported changes from support-9376 branch.
13188fbf [*] Fixed building.
9909b751 Merge branch 'develop' into 'Port-9376'