Merge branch 'revert-6809000a' into 'dev-v3.6.1'

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

See merge request !107