* Merged revisions 4622, 4636 from trunk for week 25 fixes.