Merge "Handle duplicate DOWN event" into sc-qpr1-dev