Merge "Fix an issue with alarm message accidentally deleted" into main