Merge "Bug 8746: Multi-threading improvements"