Some changes and typed data merge fix.