Merge branch 'release/v1.5.2' into develop
Menu select fix foc Chrome
Merge branch 'develop'