FS-6303 --resolve