Copying missing files from rel-1-2 to trunk