Merge "Fix cast tile crash" into oc-dev