RELEASE-NOTES: synced with 25c68903756d6b