added missing export to fix a test
Merge remote-tracking branch 'origin/master' into survival
fixed some test