cherrypick notification from icehouse