RELEASE-NOTES: synced with 22adb46a32bee