Issue 602: Catch develop-2.0.0
up to develop
#618
Merged
develop-2.0.0
up to develop
#618