Merge change 2668

* changes:
  Add sampler support