Change subId to int from long automerge: 830a40f
automerge: b7b2cd6

* commit 'b7b2cd6dc1fe03e446e1f75db2507d7ff1047d90':
  Change subId to int from long