fixes to extra_files_path modification
merge