Merge RXML branch