Merge "Deprecate volume api selection config option"