Changes in the trouble branch
Mainline work
Completed merge of trouble, fixing conflicts along the way
This is our first commit
I have made great progress on this critical matter.
The mainline keeps moving