Merge "Rename resampling property"