Merge "Support adding custom tags to APIs."