Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	ic-depress-test/META-INF/MANIFEST.MF