Allocation added back in
Merge remote-tracking branch 'upstream/master' into 6/3branch