Merge branch 'bugfix/notice-external-redirect' into 'develop'