Merge "API: Update ApiTag, fix error handling"