Merge "add service port to annotation"