RELEASE-NOTES: Synced with 812c5ace759d04