Merge Updates from foundation