Roll SS back to v1.5 #9