Merge "rename incremental service name" into rvc-dev