Try to improve multi bundle locking to make sure we make multi bundle operation atomic and so are not interleaved with single bundle operations.