Hi,
I've issued a pull request for SPN-1131 (Add support for optimistic locking).
My last run brought the same number of test failures in master and in my branch, so might
be a good idea to integrate it first and then continue fixing tests.
Cheers,
Mircea