Refs #5423 - address PR comments