Revert "Merge branch 'staging' into 'master'"

This reverts merge request !248
4 jobs for revert-677aaa46
in 7 minutes and 23 seconds and was queued for 1 second
latest