Kludge: introduce delay when clamining lock (until ocean-dynamo supports exceptions on non-unique records).
Merge branch 'master' into staging