RELEASE-NOTES: Synced with cd6ecf6a89