Disable folds on start
Disable unused bundles.
Merge remote-tracking branch 'upstream/master'