Merge change Ie3f5cd4a into eclair

* changes:
  Clean steps for a product configuration change.