Hmao/my changes
See merge request !900 (merged)
(cherry picked from commit 896518ec)
9e8e1a7b Draft 3c87dc69 Draft 1d1770c5 Draft