merged from rtomac