Merge "Implementation of distributed locking feature"