Revert "Merge branch 'cr/103221-1/032' into 'master'"
This reverts merge request !60
WARNING! Gitlab maintenance operation scheduled for Saturday 28th March from 8 a.m. (CET) to approximately 3 p.m. (CET). GitLab will be unavailable during this time.
This reverts merge request !60