Merge changes I1169beb3,If7c7b737 into rvc-dev

* changes:
  Move preparation coordinator to after grouping
  Add listener hook before finalize filter.