FS-6346
FS-6346 --resolve