Merge "Puller refactor"