Merge branch 'Port-9376' into 'develop'

Port 9376

See merge request !1494 (merged)

(cherry picked from commit 47ae39b7)

e581e4c5 [] Changes from the support-9376 branch have been ported starting from commit... 109c4057 [] Fixed.