Merge "Fix Allocation-less launches" into mnc-dev