develop-merge (preparing release of 2.0)