Port 9376

See merge request !349

(cherry picked from commit 27540e8d)

e84b1edf [*] Ported changes from working branch