APD: body tag markers
Merge branch 'APD-body_tag_markers' into develop