FS-6026 --resolve