Merge "Don't use lazy_static to create Mutex" into main