Merge branch 'jc/xsha1'