Merge "Fix bug in getStorageVolumesIncludingSharedProfiles" into tm-dev