Merge "create a flag to test flag migation" into main