Merge "Remote volume changes" into klp-dev