* sync with new puppet