Issue #2779451 by samuel.mortenson, dagmar, dman, mmcdermott: Current multi-step behaviour is confusing for users