last fixes merged to public repo
Merge branch 'develop'