HHH-9419: Remove after get with optimistic lock fails

Merge into master