FS-5420 --resolve