Merge "Update the flag for the fix related to the profile user issues" into main