Merge changes I50623d3a,Ic18b7192

* changes:
  Add extra tests for renderengine
  Add locking within RenderEngine during rendering