Fixed body handling.
Adjusted state.
Merge branch 'test' into dev