Sync with trunk. This will appear in final release.