Suggested changes from review
multi-page forms changes

Cherry picked 7407ecd34ade8c15ede5acfc9cab246674fb2bfc with adjustments to correct the example.
Suggested changes from review
Suggested changes from review