Merged in AdvKvDriver work in progress