RELEASE-NOTES: Synced with 32913182dc