Change in the trouble branch
Mainline work
Fixed merging trouble