Linda dev

Merge new stable code into master branch