Merge i003_z005 into i003