Merge "Notification handling for instantiate"