for bug
Merge branch 'next' into dev

* next:
  for render bug