Merge "Protect against weak pointer crash." into oc-mr1-dev