Merge "Remove enabled flag fix_merged_content_change_event_v2" into main