Next round of get/set mods

@rev jbuchanan@
@work W-2043302@
Merging origin/dchasman/master-pending-getSetMods into master