Merge "Fix system crash" into oc-dr1-dev