Issue 624: Catch develop-2.0.0
up to develop
#644
Merged
develop-2.0.0
up to develop
#644