Merge branch 'bugfix/post-empty-status' into 'develop'