Merge branch 'dealing-reuse'