first pass RT4 merge, RT#13852