updating rdf branch with upstream commits