Merge branch 'hotfix/bugfixes'
Merge branch 'release/brunch-toolchain-0.3.2'
Fix changelog