Tweaking installed package selection. Slimming down a good bit
mimicing more from dev before final merge
Merge branch 'dev'