Merge "Add manual connect notification" into main