Merge "BUG-987: improve generated type allocation"