refs #883 changes driven by code review