Fix render method
Merge branch 'oai' into eco-full-integration