Feature #3175: Improve SG wizard