Merge changes I15a26ba7,Ia3223ba8

* changes:
  Add test for the NetworkTraceHandler
  Parse new config options and to batch in callback