Merged in vid control changes into the big repo