Merge "Fix micro service status code"