Merge branch 'sg/t7406-chain-fix'