Components of category "Generic" missing in Composition view for substitution nested services: 

When creating a service of category that supports nesting of services by substitution (as opposed to service proxy), then in the service composition view, any components of category Generic are not displayed in the list of components available to be dragged and dropped in the pallette.

Error creating services nested by substitution mapping: 

In a service that permits services to be nested by substitution mapping  (as opposed to service proxy), if multiple services of different types are included in the composition an error in ToscaExportHandler results in an exception being thrown when generating the tosca for the service.