RELEASE-NOTES: Synced with 35e476a3f6cdd5