First commit of plugin/drop-in