API RDF improvements
Merge branch 'release/2.0.7'