Merge "Prevent some alarm pathologies" into lmp-mr1-dev