HH-37025 refactor postprocessing