Merge change 8038

* changes:
  Fix hardware overlay so all changes are commited when done.