Bug/contribute second notification removal and persistent tun notification upstream #5964