Merge changes I7bbb2559,I8aec5ebd into main

* changes:
  v6: copy in from v5
  v6: empty out directory in prep for copy