refs #1064, merging and updating