Brought in copies from Version-1.0 branch