Sync with trunk rev.61910 to get latest improvements and bugfixes.