Merge branch 'ib-5.8-jz47xx-ts' into HEAD