Bug 1006044 - add file
Merge branch1 into integration-master