Merge "Prevent getting large bitmap log error for gobo" into oc-mr1-dev