Merge "Add resampler comments and fix a typo"