That should be all bitmap helpers needed
Fixed merge conflict