Improvements in installer wizard Refs #16606