am 2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev

* commit '2e637bfd64c59200414130671e32e3e087e9f147':
  Extra sanity checks on sample size and resolution