Merge "Reduce the usage of goto statements in dispatcher" into rvc-dev