Merge branch 'notice-404-to-fe' into 'develop'