Merge changes from topic "resampling for multiple pointers"

* changes:
  Fix resampling for multiple pointers
  Fix broken input tests