Merge "update to new API Remove extra arrays and allocations for manual allocation -> int conversions which were a legacy issue."