Merge "1.24 -> 1.25"