Fix compatibility in windows with only bundle group "general".
enabled.
Update TODOs.