[FIX] mrp: backported from trunk revisions 5120,5121