Merge branch 'hotfix/2.0.7'
Fixed composer runonce
Merge branch 'hotfix/2.0.8' into develop