RELEASE-NOTES: synced with d535c4a2e1f7