merge upstream, add varargs log