Bug 1006072 - add file
Merge branch1 into integration-master