Merge branch 'logic_analyzer' into submission-mpw-3