Merge of GCW/Wiz code in rr.* (not complete yet)