CDB-1752 #fixes Automatically creates a legend when a new wizard is selected
Merge CDB-1752 into release/2.10.1