Merge "HashRing optimizations and PhpStorm warning work-arounds"