Merge branch 'fix-ti-link-order' into release