Merge "Add usesweightlist option"