Merge "Fix tacker endpoint"