Merge "[SF] Fix unittest crash"