refs #2907, #2909, #2908