Update

Pulled in changes from aerospike into our fork