CONN-575:Commit changes for #575