FS-6218 --resolve