FALCON-583. Post processing is broken in current trunk. Contributed by Venkatesh Seetharam