Mesh light instances cannot be selected for Iray light group canvases

thoreandan

Instances cannot be selected when defining Iray canvas nodes, and rendered light group canvases with the original mesh light object in the selected node do not also include light emitted by instances of that object. This makes it impossible to composite lighting with canvases when there are mesh light instances, unless you either de-instance the instances, or render the scene multiple times with different lights turned on and off.

Is there any way around this that I'm missing?