slider update
Merge branch 'hotfix-slider'