Merge "Bit: Don't ignore errors and crashes" into oc-mr1-dev