Merge "Run rustfmt" into main