#259 Added support for change address path map
Merge remote-tracking branch 'origin/develop' into develop