Merge "Use LazyLock rather than lazy_static macro." into main