Merge branch 'hotfix/0.8.15'
DRYing configuration files of transport
Merge branch 'hotfix/0.8.16' into develop