#309 Adding workbench patch in order to properly support workflow