Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'