RELEASE-NOTES: Synced with 8ae35102c43d8d