* Merged from trunk revisions 4467, 4472, 4485