Copied 3.17 to 3.18-rc1