Merge branch 'jm2/vktest' into vk/test