Merge branch 'ps/reuse'