v4.12-9514-beta
Merge remote-tracking branch 'upstream/master'