Merge request for occasional application blocking when closing port