Merge "Fixed functionality of Workflow API"