Merge "Add support for external volume handler of volume adjustements"