Merge branch '2.6.8' into wvp-28181-2.0

648540858

2023-07-06 61e5226122e7816dbaa18baec907d0e5934ee170

1
2
3
4
5
6
7
8
9
root = true
 
[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true