MS12
Merge branch 'master' into br7
revert