Implemented changes for Optimistic Offline Lock