super hot fix
big bug fix
Merge branch 'dev'
Add change log.