Bug 1006088 - add file
Merge branch1 into integration-master