feature/TDQ-8789 Add RichRecord to including the original record