Merge branch 'hotfix/issue01'
Merge branch 'develop'
get ride of new_this
Merge branch 'hotfix/new_this' into develop