Low res dev switch

This is just a updated merge of dev into #1003