chore: change alerts
Merge remote-tracking branch 'origin/v0.4' into v0.4