Code migration and project integration

Main working set in experimental, will be busting out sets to 5137/6137
as they approach functionally finished.
Merge remote-tracking branch 'origin/master'