Replace master with dev

lit_gitrequested to merge
dev into master

It's not REALLY ready for primetime, but because shared-data-model is replacing dev branch.

Merge request reports