More changes from Committee review. This checkin corresponds to
drwxr-xr-x - dwarf5