Issue #3408326 by benjifisher, omkar.podey, lauriii, srishtiiee: Make field selection a two-step form