Merge "Synchronize the setup process of edit monitor" into main