Done with this ticket. Added the new flag. This resolves #8070