Merge "Add an endpoint type for native program"