Pull in v1.2 changes