Merge branch 'tests/ostatus_controller' into 'develop'