FS-5129 --resolve