cherry pick occbin fixes

Merge request reports

Loading