Issue #2363015 by joachim, mikeryan: Add support for modifying wizards defined by other modules