Pulled in upstream DIRS_BASIC support and its application to the golang pack