Refs #5821 - address PR issues