Merge "Prevent incorrect alert triggering"