Fix for TFSTAT-71 and logo fixes
Merge