Merge remote-tracking branch 'remotes/upstream/devel' into origin-moveencoding