Merge "Implement custom workflow API"