rolling in global image changes + S 2.5.2