Merging branches and changes from jsimonelli

Merging changes from jsimonelli