Merge "Add usesninjalogasweightlist option"