Merge branch 'fix-circular-dependency-between-sja1105-and-tag_sja1105'