Merge remote-tracking branch 'kali/hotfix/add_manifest'
Merge branch 'release-0.3.2'
Fold in changes
Merge branch 'release-0.3.3'