Merge "Fix inline not worked after the service package updated" into rvc-dev