TIMOB-10223-Handle external directory properly