Enable tracing for dev purposes
Bug fiz