Merge "fix POD id type in API"