* rebase * Add changelog fragment * add suggestions * split PR into two * Add multiple address support but with #3768 fiexed * rebase * clean some merge artifacts * update the wording