Revert "Revert "T7/T9 changes""

This reverts commit c8486e83e1f3e0f1186ef1674fe92014fed79b16.