Merged the update and render step.
Merge remote-tracking branch 'origin/develop' into develop