Merge "Fix hipri status notifications"