Merge branch 'rsherman'

Merge in from Dylan’s baseline