- Fixes for locking issues - addresses CRD-172.