Merge branch 'rs/lose-leak-pending' into maint