[trunk] Sync with 1.5 branch