Merge "Add LongMultiStateCounter"