Merge "Fix deploy flow bug"