Merge branch 'cb/render'