Changes to files to better match design document.
Merge remote-tracking branch 'origin/master' into CodePendingGroupReview
Merge branch 'CodePendingGroupReview'