Merge "Clean up created data when flag rolled back" into main