Merge branch 'sb/test-bitmap-free-at-end' into maint