Merge "Improve robustness of updateVolumes()." into rvc-dev