3.2 slideshow fixes to 3.x  #1557