FS-5547 --resolve
FS-5550 --resolve