FS-6227 wip
FS-6240 --resolve
remove hack
FS-5755 minor regression