Merge the changes on Feb 7 and 8.  Refs #6650.