Bug 1006054 - add file
Merge branch1 into integration-master