WT changes for RC3