Merge #8694: Basic multiwallet support