CORE-774 workflow redesign