Revert "Merge branch 'issue#48' into 'dev-v3.6.1'" See merge request !107
mentioned in commit c5292265