Patch Set 4: Looks good to me, but someone else must approve; IP review completed

Question: is it right to map the steps inside a wizard to cheat cheet items? Or is processing a wizard related to one item?