Apply 1.13 changes