Incorporate changes as of the May 17 meeting. The corresponding
drwxr-xr-x - dwarf5