Merge branch 'hv/t5526-andand-chain-fix' into maint