Merge "[533707] Error with "reverse codegen" action"