RELEASE-NOTES: Synced with dcad09e125