@ChristopherFitzsimons, PR has been merged with the fix, the changes will reflect in upcoming solution version. Closing this issue. If you still need support for this issue, feel free to re-open it ...