No need to use an unreleasable buffer - just wrap an array
Merge remote-tracking branch: upstream/master