Use Locks instead of synchronized blocks to run blocking operations

Use Locks instead of synchronized blocks to run blocking operations #2604