More fixes for raw body handling.
Merge branch 'test' into dev