Merge "Implement a separate controller for ring volume" into tm-qpr-dev