Merge pull request #13364 from slavapestov/fix-default-witness-checking

Fix default witness checking