FS-5812 --resolve