Merge branch 'hotfix/clientorder'
added update notice
Merge branch 'hotfix/updatenotice' into develop