Merge branch '4.9' into 4.10