Merge pull request #20306 from aydun/api_case_defaults