Merge branch 'notice-routes' into 'develop'