Merge branch '2.6.9' into wvp-28181-2.0

648540858

2024-01-22 97a87542a63382d2ee129803e69e5751a3d6272c

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