RELEASE-NOTES: synced with 2ee3c63b13