* sync with puppet