FS-5441: --resolve