Merge vk-gl-cts/github-master into vk-gl-cts/master