Merge branch 'release/next-release' into develop
Handle conditional statement on login panel.
Merge branch 'develop'