Merge branch 'ps/leakfixes-more'