Merge "Support --verbose option in edit monitor" into main