Merge branch 'khronos-registry' into registry-update

New branch to test compatibility before merging into master

Author: m-shinder