Merge remote-tracking branch 'origin/devel' into bugfix/15232-revert-to-stretch-xorg...