Merge branch '1.24'