Merge from domestic code