FS-5331
FS-5343 --resolve