v4.12-9514-beta
Merge branch 'master' into ubuntu/BETA