Backport #16704 to 2014.7

Backport #16704 to 2014.7

Refs #16765