[RefData][ORI] Integrated the latest updates from RFD.