Merge "Removing outdated vsite comment" into release-4-6