BZ-12264:ECM Wizard Improvements