RELEASE-NOTES: synced with cb13fad733e