Merging TR/RE changes