Merge change 1876

* changes:
  fix warning where we were boxing and int, only to have it automatically unboxed