code cleanup Resample Operation
Merge branch 'master' into knip