Rules Issued for Bundling Renewables and Storage With Thermal and Hydropower Projects