Merge "SubId are Integers." into lmp-mr1-dev