Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint