merge resolve, when cherry-picking error_notifier commit