Merge "Fix clip serialization crash"