changes from trc repo