Closed cketti closed 1 week ago
Closes #7718 Closes #7719
I applied the suggested changes and reformatted the result to keep Spotless happy.
Closes #7718 Closes #7719