Allow renderx to overwrite resourceUri and pass options to partial
Merge branch 'develop'