Merge branch 'hotfix/0.2.5' into appsembler_master
disable smoke tests
Merge branch 'hotfix/0.2.6' into appsembler_develop