RELEASE-NOTES: Synced with 8c80840d01