Merge "Speculative fix for missing target crash" into oc-mr1-dev