refs #918 changes after code review