RELEASE-NOTES: synced with 7bb4c8cadb5d0