Merge branch 'new-4.7.27-rc' into new-master