Merge branch 'safe-render-activities' into 'develop'