Merging VKC changes into master, see commits for details