NODESCHOOL-52: Collecting pickups
Merge