Finalized COUCHBASESDK-18