First major merge into master with a working subset of features
Merge remote-tracking branch 'upstream/master' into develop