Apply 6.2.10 changes