changed stock count counter to numeric type
Merge branch 'upstream-develop' into refactor/change-to-numeric-type-counter