RELEASE-NOTES: synced with d603ed67535