Merge "fix usageState at PDU"