Merge "Avoid using lazy_static." into main