Add selection of the modules to configure (merge from HEAD)