FS-5741 --resolve