XVM 2951 - Rebased for better preformance. Should now work from installer.