Merge branch 'sja1110-doc'