Merge "Add remote join info"