Issue 571: Catch develop-2.0.0
up to develop
#577
Merged
develop-2.0.0
up to develop
#577