Hi Richard,
We have checked all the possibilities to provide the work around for the reported issue in sample level. But unable to get the appropriate solution.
So, kindly wait until the source level fix is provided. We will try to provide this before the mentioned timeline.
Regards,
Saranya Sivan.