Merge "Fix to recognize FINISHING state as paused completed" into rvc-dev