Merge "Rename from "handle to address"." into lmp-dev