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

This reverts merge request !107
1 job for revert-919de8a6 in 0 seconds (queued for 46 seconds)