FS-3912 --resolve