[mr] store deps inside the bundle
Merge remote-tracking branch 'origin/maintenance/5.6'