Issue 536: Catch develop-2.0.0
up to develop
#553
Merged
develop-2.0.0
up to develop
#553