Merge pull request #9143 from TobiasLounsbury/CRM-19432-wizard-enhancements