Merge "Add early warning tip and detector"