Merge pull request #4065 from ugbotueferhire/fix/hybrid-workflow-tests