Merge branch 'rs/pull-leakfix'