RELEASE-NOTES: Synced with ce61510127ea60