Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop'