Merge commit 'd9b1ab0b564fea713db053d3acbf98f5e4506276' * commit 'd9b1ab0b564fea713db053d3acbf98f5e4506276': Remove calls to dump_l.