Merge "More precise control of batch alarm." into lmp-dev