Merge "post_proc: fix post and pre process KW issues"