RELEASE-NOTES: Synced with 0f213fdca1