FS-6020 --resolve