Merge branch 'hotfix_1.5.4' into develop
update: change preconnect event message
Merge branch 'develop'