FS-3924 --resolve