Fix 2.1.0 message
Merge branch 'fix-2.1.0' into develop

Conflicts:
	src/main/java/Test/App.java