Merged
requested to merge fix/use_local_address_as_from_when_calling_back_from_history into release/4.5
When calling back from history, try to use the address that received/initiated the original call as From
When calling back from history, try to use the address that received/initiated the original call as From