Merge remote-tracking branch 'origin/develop'

Conflicts:
	core/scripts/modules/appConfig.js
	tasks/processors/imageWritingProcessor.js