FS-5254 --resolve