Merge branch 'hotfix/updatenotice2'
removed update notice
Merge branch 'hotfix/updatenotice3' into develop