HCOLL-167 added ACQUIRE_USING on the server
Merge remote-tracking branch 'origin/master'