Merge pull request #18223 from mikedn/inc-codegen