Merge "Partial revert of Ic0055a53ac85980fa22136a5c8b6cb59be347da9" into lmp-dev