Merge "Improve tracking of memory locations in LVN."