Locking failure now propperly triggers create retry.
Merge branch 'test' into dev