Merge "Fix register micro service code"