Merge branch '4.7.21-rc' into master