FS-5285 --resolve