Merge "Address bug 1839794 on the Volume show version client"