Issue #3577999: Backport: support body field v2.

Closes #3577999

Merge request reports

Loading