[MERGE] merged the dev branch with formatting of the addresses that depends on the...