Backport for 2.0 with the wizard patch by cedk