Merge "Replace newAccelerator() with getLocalServerInstance()"