Merge remote-tracking branch 'origin/patch' into SAM_1968

Author: sjanzou

deploy/runtime/cashflow.lk

@@ -306,6 +306,7 @@ function cf_om_expenses()
 	{
 		cfline( 'cf_om_fixed2_expense,cf_om_production2_expense,cf_om_capacity2_expense', 0);
 		cfline( 'cf_fuelcell_replacement_cost', 0);
+		cfline( 'cf_om_fuel_expense', 0);
 	}
 	if ( is_fuel_tech() ) { cfline('cf_om_fuel_expense', 0); }
 	if ( tech == 'Biopower' ) { cfline( 'cf_om_opt_fuel_1_expense,cf_om_opt_fuel_2_expense', 0); }
@@ -379,7 +380,7 @@ function cf_operating_expenses()
 	cf_om_expenses();
 	cfline( 'cf_property_tax_expense', 0);
 	cfline( 'cf_insurance_expense', 0);
-   	if ( is_land_lease_config() ) { cfline('cf_land_lease_expense', 0); }
+   	if ( is_land_lease_config() && strpos(technology(),'Hybrid') < 0 ) { cfline('cf_land_lease_expense', 0); } // hybrid land lease handled in cf_om_expenses() function
    	if ( fin == 'Community Solar')
 	{
 		cfline('cf_community_solar_recurring_fixed', 0);