Merge branch 'master' into dev
Carousel improvements
Merge branch 'dev'