Merge pull request #10967 from SteveCEvans/remove_f1_f3