RELEASE-NOTES: Synced with fd1ce3856a