Merge remote-tracking branch 'origin/roland' into manfred