Revert "Merge branch 'issue#48' into 'dev-v3.6.1'"
This reverts merge request !105
WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
This reverts merge request !105