Bug 1006062 - add file
Merge branch1 into integration-master