Merge "String update for setup wizard"