Merge branch 'jc/check-x-z'