Merge remote-tracking branch 'upstream/develop' into with_image_analyzer_module