use canonical desired_source instead change_address
Merge pull request #518 from ouziel-slama/master

use canonical desired_source instead change_address (master)