Merge branch 'hotfix/hot_fix' into develop
auto slider
Merge branch 'release/8.1'