Update Changes for dagolden-unified branch