final changes and fixes for workflow dev
Merge pull request #1508 from reciprocity/feature/workflow-dev-final-fixes

final changes and fixes for workflow dev