Merge branch 'ps/leakfixes'