#537 added configuration switch for dispatch enabled