Merge "Fix Allocation-less launches"