[v6r8] Wild card import fixes in Workflow

Closes #1270