FS-6007 FS-5083 FS-4514 --resolve
fix trivial compiler warning for last commit