merge drop_puppet
Merge