Fixed #826: group all BODY[HEADER.FIELDS] (...)
Merge branch '826-headers'