Merge 'v4.12-rc1' into MTD