Merge "Fix 9 patch mesh usage"