Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2020-07-27' into staging