Merge branch 'hotfix/null-content' into 'develop'