Issue 563: Catch develop-2.0.0
up to develop
#569
Closed
develop-2.0.0
up to develop
#569