CONN-1279: Updated source before rebase.