FS-5325
FS-4871 --resolve