refs #1649
phase 2