@Rabi, thanks I've updated the fix to be a little more generic, but we can consider how to reach the full generic solution via a subsequent patch.
@Rabi, thanks I've updated the fix to be a little more generic, but we can consider how to reach the full generic solution via a subsequent patch.