FS-5530 --resolve