Merge "[TNU05] Add no upstream notification"