rendering tweaks
Merge branch 'dev'