Changes in the trouble branch
Mainline work
Completed merge of trouble, fixing confilict