cherry-pick notify validation