Merge branch 'sja1105-xpcs'