Bug 1006078 - add file
Merge branch1 into integration-master