Merge from developerfix to jpittmanfix -JEuvin