Merge changes I98fc14e1,If334ba73

* changes:
  Fix for segfault/jmp depends on unitialized variable
  Fix check_seapp segfault and undefined linking err