Apply the option to a non-composite function in Convolution. Re #8066
Merge branch 'feature/8066_output_convolved_components' into develop