FS-6042 FS-6044 --resolve