[trunk] Sync with branch 1.5