CONN-1068: Updated review comments and license header.