Merge remote-tracking branch 'upstream/develop' into patch-image-description