TIMOB-10223-Handle external directory properly
Merge pull request #5347 from salachi/TIMOB-10223

[TIMOB-10223] Handle external directory properly