Revert "Merge branch 'master' into 'production'"

This reverts merge request !96
1 job for revert-7f58b8da in 3 seconds (queued for 52 seconds)