Port 9376

See merge request !341

(cherry picked from commit bea9dbd4)

702a1434 [*] Ported changes from support-9376 branch.