Fixed reply on bad header.
Merge branch 'test' into dev