RELEASE-NOTES: Synced with 1933f9d33c