FS-6147 --resolve