RELEASE-NOTES: Synced with 0ab2c444b5