Merge remote-tracking branch 'lapilofu/hotfix/manifest' into release