Merge branch 'jc/xsha1' into next