Merge Updates from head

Merge updates from head