Merge "Add reporting for disconnect reason" into main