@namontague - Thanks for the solution. Creating a patch for the same.