For Bug 1011295

For Bug 1011295