RELEASE-NOTES: Synced with 6291a16b20