RELEASE-NOTES: Synced with 0f81fbe5da6643