merging branch
fixed execing worker with locking/ nolocking