Merge branch 'master' into develop
check shop 3
check shop 4
check shop 5
Merge branch 'feature-stat-asinc-load'