Merge branch 'hotfix/activity-without-content' into 'develop'