Merge Slider fixes into dev