Bug408042 import to working set

Implementation of Bug 408042