FS-5589 --resolve
FS-3911 --resolve patch applied