Add object renderer
Use short name of template
add default template chnghe
Merge branch 'dev'