Additions to MOH257 (https://www.pivotaltracker.com/story/show/62142254)