RELEASE-NOTES: synced with 4cb2521595