Hmao/my changes
See merge request !904 (merged)
(cherry picked from commit 8e5c7b3a)
9d59af31 My second Draft ca98745f my third draft