FS-5762 FS-5765 --resolve