Merge branch 'ib/4.17-bitmap' into next

Bring in bitmap API improvements.