Fix test case issues
Update correlation ID header
Merge branch 'rel-0.7.3' into stable
Merge branch 'stable'