Merge branch 'jc/xsha1-2' into next