Merge changes from Khronos repository