Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

64850858

2021-06-25 0802677d0b609abc8de0f0d882c6dbf483fc1987

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