Refs #5538: Rabases #5539 for 1.8

Rebased, but tests do not pass. Cannot investigate this at the moment.