Fixed CW-696 (Notification not needed)