Merge i003_z001 into i003