Changes from JWS2 branch concerning local execution and logging