RELEASE-NOTES: synced with f646e9075f47