Merge "added support for custom endpoint type"