Merge remote-tracking branch 'origin/moonshot-packaging-fixes' into HEAD