FS-5196 --resolve
FS-5200 --resolve this patch did not apply please be up to date with latest HEAD when generating patches
FS-5011 please update and retest with new logs