TIMOB-10223-Handle external directory properly
Merge pull request #5509 from pec1985/timob-10223-3_2_X

[TIMOB-10223](3_2_X) Backport - Handle external directory properly