RELEASE-NOTES: Synced with aaaf9e50ec