RELEASE-NOTES: synced with 255826c40f9316