Fix identity-selection using Return-Path headers (#1489241)
Updated changelog