CONN-1119 & CONN-1143: Formatted the source and for outbound we do need to update remotehcid