#8040: port versionswitcher patch to 2.6.
3 files changed