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

This reverts merge request !399
3 jobs for revert-1259b0fe
in 9 minutes and 17 seconds and was queued for 0 seconds
latest