Merge "Make ti-stress work on RI"