Feature 71581790 - Remove output content refactor