Changes in the trouble branch
mainline work
Completed merge of trouble, fixing conficts along the way