Merge "Force refactor flag disabled in some unittests" into main