Merge "Avoid telecom crash" into oc-mr1-dev