Thom/Seth Merging changes from master