Merge branch 'b2969' into v6.6

Refs #2969