Fixed #5529 (Further control in selecting what configurations to consider)