RELEASE-NOTES: Synced with 52d16c84d2