Merge branch 'feature/SLIDER-35' into develop