Merge blockdev_ops to master for volume use and state checks
Fix merge conflict