Merge branch 'release/v1.2.2' into develop
fix trademark statement hidding on login
release version 1.2.3
Merge branch 'release/v1.2.3'