Merge from trunk
Slider faster and drives over lion rails instead of aside