Manuel merge from dennis_threading branch