FS-6340 --resolve