Issue #2186155 by DamienMcKenna: Follow-up to fix a number of scenarios.