RELEASE-NOTES: Synced with 7fef4016de