Merge "Report resolution stop" into main