Improve formatting

[#52140727]
Improve formatting

[#52140727]
Improve formatting

[#52140727]
Merge 52140727- to master

[#52140727]