Merge branch 'develop'
Add log write feature