merge from NovaFusion