Wordsmithing.
Merge branch 'master' into extend-baseimpl