RELEASE-NOTES: Synced with 8ddda0e999