#ARQGRA-373: Fixed resolving non-absolute locations

Applied patch from ARQGRA-373