FS-4865 --resolve
FS-5761 --resolve this solution is sufficient