Merge "add service endpoint annotation"