Merge "Fixed check for volume name." into nyc-dev