Merge "Javelin: enable volume resources"