Merge branch 'fix/safe-render-notifications' into 'develop'