Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging