Refs #7215 Need change to merge with another ticket