Merge "allow null type for primitives"