Bitmapfill fix

Local pull-merge