Merge "Fix monkey crash" into oc-dev