Merge "Proper MB_CUR_MAX." into lmp-dev