Merge "Fix comments in resampler assembly"