FS-5695 --resolve
FS-5719 --resolve