Merge "bug fix for virtual deployment."