Supported locking strategy "default"
Merged branch
Minor: removed lock on authentication