(cherry picked from commit 717d0f5934) Conflicts: routers/api/v1/api.go trivial contextual conflict
717d0f5934