Merge branch 'hotfix/new_this' into develop
background job
Merge branch 'develop'