Move metadata to body [RTFACT-17068]