Backport a few minor chagnes.
Merge branch 'master' into surface