Merge branch 'bugfix/harden_status_output' into 'develop'