Yesterday
merge from ban_notifications_fix