Merging 1.12.10 changes