Merge "Handling cases with a null bitmap." into oc-dev