Merge "Check refactor flag state in old and new code" into main