Changes in the trouble branch
Mainline work
resolved conflicts
resolved conflicts