Merge "fix conditional step label"