merge from bobby 08/11