Merge "post_proc: Fix for KW reported P1 issues"