Merge branch 'sb/p5310-and-chain'