Better error handling and fix for ProcessingModule Images
Merge remote-tracking branch 'origin/development' into development