Fixing issue #346.
Fixes issue #347.
Fixing issue #348.
Fixing issue #345.
Fixing test.
Merge branch 'hotfix/1.6.2' into develop

Conflicts:
	.settings/org.eclipse.jdt.core.prefs