Merge pull request #20819 from seamuslee001/fix_apiv4_syntaxtests