Refs #7224 - Start additional requested changes