From master: Demo prep for Single-Volume IMA support.