Merge "Adding new virtual instances for manila"