Merge pull request #17046 from MegaphoneJon/fix-ftaclcheck