Merge remote-tracking branch 'origin/issue_344_segv_trace_wireshark' into develop_integration_2018_w35