Merge "Replace lazy_static with once_cell" into main