[develop]
fix render bug in adaptor
Merge branch 'develop'