Refs #362 added to develop