FS-5814 --resolve
force sofia rebuild
FS-5814
FS-5814