merged init_puppet from master.