RELEASE-NOTES: Synced with 5cdb61abb2