Update to 4.12-rc1
Merge branch '4.12-rc1'