Merge branch '1-3-edit-addr-fix' into 1-3