Merge branch '2.4'