Resync with MarkLodato Branch

Branch resync