Merge "Update D2D logic in line with new opt-out rules" into sc-dev