FC-2778 updated postprocessing