Latest upstream for additional security fixes