FS-4978 --resolve this is fine besides one minor change to only consider this path when we are doing passthru
FS-4985 --resolve