Support Unsafe Primitives and related API changes
Merge heads (development)