FS-5275 --resolve