Issue #7004 p.1 Fixed executor_id and check date. Now can be blank