Merge "Use local variable for volume instead of instance one"