manual: Merge change by Matthias