Merge "Fix post-processor macros & remove vizualization"