RELEASE-NOTES: Synced with 2cac75c4e400