Revert "Merge branch 'issue#48' into 'dev-v3.6.1'"

This reverts merge request !105
1 job for revert-6809000a
in 0 seconds, using 0 compute credits, and was queued for 54 seconds
latest