RELEASE-NOTES: synced with 47f8e99e78c