Updated Step 1 fields
Merge commit