RELEASE-NOTES: synced with ae26ee3489588f0