Merge branch 'ib-array-bitmaps' into devel