Merge "Combine manu id and data before setting to stack." into lmp-dev