Merge remote-tracking branch 'origin/6714-generator-refactor' into 6714-generator-refactor
Merge branch '6714-generator-refactor'